tests: use option "--no-sign-verify" for adding remote

Option "--no-sign-verify" disable the signature verification including
GPG. So use it in tests instead of "--no-gpg-verification".

Signed-off-by: Denis Pynkin <denis.pynkin@collabora.com>

diff --git a/tests/pull-test.sh b/tests/pull-test.sh
index 2cfd8e02f790ffbba739f3ec4845d17da490d8c9..a52adab9712f88ae310e636563342e4e38b7cd17 100644 (file)
--- a/tests/pull-test.sh
+++ b/tests/pull-test.sh
@@ -29,7 +29,7 @@ function repo_init() {
     ${CMD_PREFIX} ostree --repo=repo remote add origin $(cat httpd-address)/ostree/gnomerepo "$@"
 }
 
-repo_init --no-gpg-verify
+repo_init --no-sign-verify
 
 # See also the copy of this in basic-test.sh
 COMMIT_ARGS=""
@@ -62,7 +62,7 @@ else
 fi
 
 # Try both syntaxes
-repo_init --no-gpg-verify
+repo_init --no-sign-verify
 ${CMD_PREFIX} ostree --repo=repo pull origin main >out.txt
 assert_file_has_content out.txt "[1-9][0-9]* metadata, [1-9][0-9]* content objects fetched"
 ${CMD_PREFIX} ostree --repo=repo pull origin:main > out.txt
@@ -164,7 +164,7 @@ echo "ok pull (bareuseronly mirror)"
 
 # Corruption tests <https://github.com/ostreedev/ostree/issues/1211>
 cd ${test_tmpdir}
-repo_init --no-gpg-verify
+repo_init --no-sign-verify
 if ! is_bare_user_only_repo repo; then
 if ! skip_one_without_user_xattrs; then
     if is_bare_user_only_repo repo; then
@@ -216,7 +216,7 @@ if ! skip_one_without_user_xattrs; then
     done
 
     # And ensure the repo is reinitialized
-    repo_init --no-gpg-verify
+    repo_init --no-sign-verify
     echo "ok corruption"
 fi
 else
@@ -320,7 +320,7 @@ echo "ok pull specific commit"
 
 # test pull -T
 cd ${test_tmpdir}
-repo_init --no-gpg-verify
+repo_init --no-sign-verify
 ${CMD_PREFIX} ostree --repo=repo pull origin main
 origrev=$(${CMD_PREFIX} ostree --repo=repo rev-parse main)
 # Check we can pull the same commit with timestamp checking enabled
@@ -350,7 +350,7 @@ ${CMD_PREFIX} ostree --repo=repo pull origin main
 echo "ok pull timestamp checking"
 
 cd ${test_tmpdir}
-repo_init --no-gpg-verify
+repo_init --no-sign-verify
 ${CMD_PREFIX} ostree --repo=repo pull origin main
 ${CMD_PREFIX} ostree --repo=repo fsck
 # Generate a delta from old to current, even though we aren't going to
@@ -375,7 +375,7 @@ ${CMD_PREFIX} ostree --repo=ostree-srv/gnomerepo summary -u
 # Explicitly test delta fetches via ref name as well as commit hash
 for delta_target in main ${new_rev}; do
 cd ${test_tmpdir}
-repo_init --no-gpg-verify
+repo_init --no-sign-verify
 ${CMD_PREFIX} ostree --repo=repo pull origin main@${prev_rev}
 ${CMD_PREFIX} ostree --repo=repo pull --dry-run --require-static-deltas origin ${delta_target} >dry-run-pull.txt
 # Compression can vary, so we support 400-699
@@ -388,7 +388,7 @@ done
 
 # Test pull via file:/// - this should still use the deltas path for testing
 cd ${test_tmpdir}
-repo_init --no-gpg-verify
+repo_init --no-sign-verify
 ${CMD_PREFIX} ostree --repo=repo remote delete origin
 ${CMD_PREFIX} ostree --repo=repo remote add --set=gpg-verify=false origin file://$(pwd)/ostree-srv/gnomerepo
 ${CMD_PREFIX} ostree --repo=repo pull origin main@${prev_rev}
@@ -400,7 +400,7 @@ echo "ok pull file:// + deltas required"
 # Explicitly test delta fetches via ref name as well as commit hash
 for delta_target in main ${new_rev}; do
 cd ${test_tmpdir}
-repo_init --no-gpg-verify
+repo_init --no-sign-verify
 ${CMD_PREFIX} ostree --repo=repo pull origin main@${prev_rev}
 ${CMD_PREFIX} ostree --repo=repo pull --require-static-deltas origin ${delta_target}
 if test ${delta_target} = main; then
@@ -414,12 +414,12 @@ done
 
 # Test no-op with deltas: https://github.com/ostreedev/ostree/issues/1321
 cd ${test_tmpdir}
-repo_init --no-gpg-verify
+repo_init --no-sign-verify
 ${CMD_PREFIX} ostree --repo=repo pull origin main
 ${CMD_PREFIX} ostree --repo=repo pull --require-static-deltas origin main
 
 cd ${test_tmpdir}
-repo_init --no-gpg-verify
+repo_init --no-sign-verify
 ${CMD_PREFIX} ostree --repo=repo pull origin main@${prev_rev}
 ${CMD_PREFIX} ostree --repo=repo pull --disable-static-deltas origin main
 ${CMD_PREFIX} ostree --repo=repo fsck
@@ -437,7 +437,7 @@ cd ${test_tmpdir}
 ${CMD_PREFIX} ostree --repo=ostree-srv/gnomerepo static-delta generate --swap-endianness main
 ${CMD_PREFIX} ostree --repo=ostree-srv/gnomerepo summary -u
 
-repo_init --no-gpg-verify
+repo_init --no-sign-verify
 ${CMD_PREFIX} ostree --repo=repo pull origin main@${prev_rev}
 ${CMD_PREFIX} ostree --repo=repo pull --require-static-deltas --dry-run origin main >byteswapped-dry-run-pull.txt
 ${CMD_PREFIX} ostree --repo=repo fsck
@@ -451,7 +451,7 @@ echo "ok pull byteswapped delta"
 cd ${test_tmpdir}
 rm ostree-srv/gnomerepo/deltas -rf
 ${CMD_PREFIX} ostree --repo=ostree-srv/gnomerepo summary -u
-repo_init --no-gpg-verify
+repo_init --no-sign-verify
 if ${CMD_PREFIX} ostree --repo=repo pull --require-static-deltas origin main 2>err.txt; then
     assert_not_reached "--require-static-deltas unexpectedly succeeded"
 fi
@@ -459,7 +459,7 @@ assert_file_has_content err.txt "deltas required, but none found"
 ${CMD_PREFIX} ostree --repo=repo fsck
 
 # Now test with a partial commit
-repo_init --no-gpg-verify
+repo_init --no-sign-verify
 ${CMD_PREFIX} ostree --repo=repo pull --commit-metadata-only origin main@${prev_rev}
 if ${CMD_PREFIX} ostree --repo=repo pull --require-static-deltas origin main 2>err.txt; then
     assert_not_reached "--require-static-deltas unexpectedly succeeded"
@@ -467,7 +467,7 @@ fi
 assert_file_has_content err.txt "deltas required, but none found"
 echo "ok delta required but don't exist"
 
-repo_init --no-gpg-verify
+repo_init --no-sign-verify
 ${CMD_PREFIX} ostree --repo=repo pull origin main@${prev_rev}
 if ${CMD_PREFIX} ostree --repo=repo pull --require-static-deltas origin ${new_rev} 2>err.txt; then
     assert_not_reached "--require-static-deltas unexpectedly succeeded"
@@ -595,7 +595,7 @@ if has_gpgme; then
 fi
 
 cd ${test_tmpdir}
-repo_init --no-gpg-verify
+repo_init --no-sign-verify
 mv ostree-srv/gnomerepo/refs/heads/main{,.orig}
 rm ostree-srv/gnomerepo/summary
 (for x in $(seq 20); do echo "lots of html here "; done) > ostree-srv/gnomerepo/refs/heads/main

diff --git a/tests/pull-test2.sh b/tests/pull-test2.sh
index 064bbfe618f562c3dba1407e7ded13bd943d47d5..a0b699aec33dd9c323665b2d29cd507cc43c848a 100644 (file)
--- a/tests/pull-test2.sh
+++ b/tests/pull-test2.sh
@@ -29,7 +29,7 @@ function repo_init() {
     ${CMD_PREFIX} ostree --repo=repo remote add origin $(cat httpd-address)/ostree/gnomerepo "$@"
 }
 
-repo_init --no-gpg-verify
+repo_init --no-sign-verify
 
 # See also the copy of this in basic-test.sh
 COMMIT_ARGS=""
@@ -48,7 +48,7 @@ fi
 
 echo "1..1"
 cd ${test_tmpdir}
-repo_init --no-gpg-verify
+repo_init --no-sign-verify
 prev_rev=$(ostree --repo=ostree-srv/repo rev-parse ${remote_ref}^)
 rev=$(ostree --repo=ostree-srv/repo rev-parse ${remote_ref})
 ${CMD_PREFIX} ostree --repo=ostree-srv/repo static-delta generate ${remote_ref}

diff --git a/tests/test-pull-mirrorlist.sh b/tests/test-pull-mirrorlist.sh
index 85ff66e99f8ef8f0df0971599d70d0814388e5df..ed65eb64727b1994772b21caaf96fee30486de12 100755 (executable)
--- a/tests/test-pull-mirrorlist.sh
+++ b/tests/test-pull-mirrorlist.sh
@@ -75,7 +75,7 @@ EOF
 cd ${test_tmpdir}
 mkdir repo
 ostree_repo_init repo
-${CMD_PREFIX} ostree --repo=repo remote add origin --no-gpg-verify \
+${CMD_PREFIX} ostree --repo=repo remote add origin --no-sign-verify \
   mirrorlist=$(cat httpd-address)/ostree/mirrorlist
 ${CMD_PREFIX} ostree --repo=repo pull origin:main
 
@@ -87,7 +87,7 @@ cd ${test_tmpdir}
 rm -rf repo
 mkdir repo
 ostree_repo_init repo
-${CMD_PREFIX} ostree --repo=repo remote add origin --no-gpg-verify \
+${CMD_PREFIX} ostree --repo=repo remote add origin --no-sign-verify \
   --contenturl=mirrorlist=$(cat httpd-address)/ostree/mirrorlist \
   $(cat httpd-address)/ostree/gnomerepo
 ${CMD_PREFIX} ostree --repo=repo pull origin:main
@@ -100,7 +100,7 @@ cd ${test_tmpdir}
 rm -rf repo
 mkdir repo
 ostree_repo_init repo
-${CMD_PREFIX} ostree --repo=repo remote add origin --no-gpg-verify \
+${CMD_PREFIX} ostree --repo=repo remote add origin --no-sign-verify \
   --contenturl=mirrorlist=$(cat httpd-address)/ostree/mirrorlist \
   mirrorlist=$(cat httpd-address)/ostree/mirrorlist
 ${CMD_PREFIX} ostree --repo=repo pull origin:main

diff --git a/tests/test-refs-collections.sh b/tests/test-refs-collections.sh
index bf233970737459c7af7e506a4aaf022276eff990..d33f498c676a61d19e42a420c9955311a73fdebf 100755 (executable)
--- a/tests/test-refs-collections.sh
+++ b/tests/test-refs-collections.sh
@@ -112,7 +112,7 @@ mkdir collection-repo
 ostree_repo_init collection-repo --collection-id org.example.RemoteCollection
 mkdir -p adir
 ${CMD_PREFIX} ostree --repo=collection-repo commit --branch=rcommit -m rcommit -s rcommit adir
-${CMD_PREFIX} ostree --repo=repo remote add --no-gpg-verify --collection-id org.example.RemoteCollection collection-repo-remote "file://${test_tmpdir}/collection-repo"
+${CMD_PREFIX} ostree --repo=repo remote add --no-sign-verify --collection-id org.example.RemoteCollection collection-repo-remote "file://${test_tmpdir}/collection-repo"
 ${CMD_PREFIX} ostree --repo=repo pull collection-repo-remote rcommit
 
 ${CMD_PREFIX} ostree --repo=repo refs --collections > refs
@@ -129,7 +129,7 @@ mkdir no-collection-repo
 ostree_repo_init no-collection-repo
 mkdir -p adir2
 ${CMD_PREFIX} ostree --repo=no-collection-repo commit --branch=rcommit2 -m rcommit2 -s rcommit2 adir2
-${CMD_PREFIX} ostree --repo=repo remote add --no-gpg-verify no-collection-repo-remote "file://${test_tmpdir}/no-collection-repo"
+${CMD_PREFIX} ostree --repo=repo remote add --no-sign-verify no-collection-repo-remote "file://${test_tmpdir}/no-collection-repo"
 ${CMD_PREFIX} ostree --repo=repo pull no-collection-repo-remote rcommit2
 ${CMD_PREFIX} ostree --repo=repo refs --collections > refs
 assert_not_file_has_content refs "rcommit2"

diff --git a/tests/test-remote-add.sh b/tests/test-remote-add.sh
index bb7eae895d10318045447274331b5735dbbef219..40a32f579ef7fca483acba9659da5ce04f6bb746 100755 (executable)
--- a/tests/test-remote-add.sh
+++ b/tests/test-remote-add.sh
@@ -30,20 +30,20 @@ $OSTREE remote add origin http://example.com/ostree/gnome
 $OSTREE remote show-url origin >/dev/null
 echo "ok config"
 
-$OSTREE remote add --no-gpg-verify another http://another.com/repo
+$OSTREE remote add --no-sign-verify another http://another.com/repo
 $OSTREE remote show-url another >/dev/null
 echo "ok remote no gpg-verify"
 
-if $OSTREE remote add --no-gpg-verify another http://another.example.com/anotherrepo 2>err.txt; then
+if $OSTREE remote add --no-sign-verify another http://another.example.com/anotherrepo 2>err.txt; then
     assert_not_reached "Adding duplicate remote unexpectedly succeeded"
 fi
 echo "ok"
 
-$OSTREE remote add --if-not-exists --no-gpg-verify another http://another.example.com/anotherrepo
+$OSTREE remote add --if-not-exists --no-sign-verify another http://another.example.com/anotherrepo
 $OSTREE remote show-url another >/dev/null
 echo "ok"
 
-$OSTREE remote add --if-not-exists --no-gpg-verify another-noexist http://another-noexist.example.com/anotherrepo
+$OSTREE remote add --if-not-exists --no-sign-verify another-noexist http://another-noexist.example.com/anotherrepo
 $OSTREE remote show-url another-noexist >/dev/null
 echo "ok"
 
@@ -69,7 +69,7 @@ cd ${test_tmpdir}
 rm -rf parent-repo
 ostree_repo_init parent-repo
 $OSTREE config set core.parent ${test_tmpdir}/parent-repo
-${CMD_PREFIX} ostree --repo=parent-repo remote add --no-gpg-verify parent-remote http://parent-remote.example.com/parent-remote
+${CMD_PREFIX} ostree --repo=parent-repo remote add --no-sign-verify parent-remote http://parent-remote.example.com/parent-remote
 $OSTREE remote list > list.txt
 assert_file_has_content list.txt "origin"
 assert_file_has_content list.txt "another"

diff --git a/tests/test-summary-collections.sh b/tests/test-summary-collections.sh
index 777d3d0c934c8c88da733a0b9832c95620e4dcb9..9885c5eafe7008f8c63272be2b809aa55e12390d 100755 (executable)
--- a/tests/test-summary-collections.sh
+++ b/tests/test-summary-collections.sh
@@ -63,7 +63,7 @@ mkdir collection-repo
 ostree_repo_init collection-repo --collection-id org.example.RemoteCollection
 mkdir -p adir
 ${CMD_PREFIX} ostree --repo=collection-repo commit --branch=rcommit -m rcommit -s rcommit adir
-${CMD_PREFIX} ostree --repo=repo remote add --no-gpg-verify --collection-id org.example.RemoteCollection collection-repo-remote "file://${test_tmpdir}/collection-repo"
+${CMD_PREFIX} ostree --repo=repo remote add --no-sign-verify --collection-id org.example.RemoteCollection collection-repo-remote "file://${test_tmpdir}/collection-repo"
 ${CMD_PREFIX} ostree --repo=repo pull collection-repo-remote rcommit
 ${CMD_PREFIX} ostree --repo=repo summary --update
 
@@ -75,7 +75,7 @@ mkdir no-collection-repo
 ostree_repo_init no-collection-repo
 mkdir -p adir2
 ${CMD_PREFIX} ostree --repo=no-collection-repo commit --branch=rcommit2 -m rcommit2 -s rcommit2 adir2
-${CMD_PREFIX} ostree --repo=repo remote add --no-gpg-verify no-collection-repo-remote "file://${test_tmpdir}/no-collection-repo"
+${CMD_PREFIX} ostree --repo=repo remote add --no-sign-verify no-collection-repo-remote "file://${test_tmpdir}/no-collection-repo"
 ${CMD_PREFIX} ostree --repo=repo pull no-collection-repo-remote rcommit2
 ${CMD_PREFIX} ostree --repo=repo summary --update